removing commented stuff