Removed unused commented out code