Trying to get rid of some things