Cleaning up app methods in preparation for more safety.