Cleanup and adding missing files