Cleaning obsolete code