Remove unused method. Add #regions to make refactor clearer.