tidy up inclusion, delete visitor