Revert the @ACL annotation processing back to 4.3 logic
Remove the unused imports.