removed uneccessary commented out code