Cleaning up Authorisation Data Access