Removed bad apps, back to components