Cleaned out some unnecessary objects