Remove obsolete code, update readme