cleaning up switch to devel branch