Remove bits as I copy them into the new app setup.