Cleaning up dev code