Removing more obsolete code