Remove canonical services.
Added notes about potential bugs (TODOs)