Removing references to Controller and AG Security