more cleanups
clean ups