Attempting more cleanups