Merge of cleanup from Messing branch