Removed some code that wasn't used