Need to get rid of a few things