removed commented out code etc