Switch back to dev

cleaning up leftovers