Removing obsolete code