Removed some old commented out code that wasn't being used anymore