removed some uncommited code