Removed old service layer, removed import references to old service layer, fixed numerous small bugs in switchover.