horde more cleanups