Cleanup old cruft
Fix usage text