Refactorings

Smaller refactorings and removals to rely on core code instead of overrides.