Cleanup some button names and get rid of extraneous files.