Removing some obsolete code.