#167 cleanup