Cleaning up dev merge