[TASK] Clean-up Annotation