if removing this simplifies and helps refactoring that is much much better. We don't support legacy code in Gush.