Update to use Maven Annotations

This isn't needed anymore