cleaning up for #306