Cleanup

General file cleanup