Cleaning up dev functions