Few more cleanups