clean up usage take two