Lcg/cleanup

This is going to be easier to review after lcg/aix-fixes2 is merged since its built on that.

This is a PR to handle the outstanding stuff from #109