Cleanup, usage instructions update