Getting rid of dev branch for now