cleanup of annotation interfaces