Cleanup, new watch app build.