Clean up acl data handler, add username to user handler for cheffish