deleted some obsolete code