Further cleanups. See log for removal list