Removed some unused commented out code