tidy up devel branch