access fixes, unused functions