Removed some old code that wasn't used anymore