Production controller refactor
Clean some legacy code