Yes, I want to remove it on my next refactor