uncommenting/cleanup from previous commit