Cleaned out some code