more cleanups and => false