Refactoring. Get rid of the helper which is no longer needed. Removing the unnecessary columns dependencies.