Deleted obsolete code