Resolving leftover code from apps

Follow