Removed some classes and changed controllers as a result of IResult change.