Cleaning up app and activity blueprints