akbertram Additional cleanup