Cleanup files. Final commit before UI change.