Removed some unused and commented out code.