access control - tidy up