Remove obsolete code and files