cleaning obsolete code