Removed some messy code