Delete unused code and refactor editions controller