rm backups, clean syntax per clang suggestions