Cleanup and added missing files.