clean ups / checked usage