Removed leftover code
Added framing capabilities for the Annotation Set