Cleanup and added more apps