tidy up before v1