clean up of unused methods and tidy up of inconsistent key lookup