Changes

* removed some dead code