Remove obsolete stuff and cleanups