removing some obsolete code