removed extra code irrelavant to PR