Cleaning up app imports a bit.