more cleanups from old projects