clean up
removed unnecssary/redundant code