Bugfix: dissociate context with old effect

Should only matter when removing an existing attribute layer
Tidy ConceptDiagramPortlet code up a bit
Tidy up subsumption pattern

Remove copy and paste code from concept pattern