removed some obsolete lines