removed logging feature
some tidying up