Cleanup and add new apps