#318 - clean-up from previous commit