Removed obsolete classes, files, refactored services/controllers to use CSA. Added FIXME's where appropriate