[TASK] Clean-Up Annotations