Some clean ups worth having