Remove annotations (rebased onto develop)



This is the same as gh-705 but rebased onto develop.

----

Fix problem described by http://trac.openmicroscopy.org.uk/ome/ticket/10343