Cleanup older code, write in accordance with present Annotation framework