Refactoring - removals.