Removing some obsolete code