Removed commented out code that wasn't supposed to be checked in