Map annotation definitions

Removes the obsolete Entry elements to MassRemover and replaces the "al" piece names on Annotations. Does not implement a way to mass remove perimeter lines and other annotations as the piece definitions and/or MassRemover need to be updated to either accommodate dynamic names (by using a marker perhaps).