remove more obsolete code, cleanups, fixes