Cleaned out the entites stuff