Removed some disabled code and enabled update user role field for aloe gateways.