Cleanup, less dependencies between activities and fragments.