cleaned commented out code away