er. removed some inadvertently committed code