removing obsolete code