cleaning up from dev merge