Removed some code that's not used