tidy up for v1.1 push