removed unused commented out code