Both options need to be available within a module.  If I no longer want something in a module I can only remove it, so it still stays in pages, assignments, etc.  Just more junk to weed through when looking for something or a million more clicks to go into the category and delete there.

Canvas needs to be more user friendly with LESS CLICKS!