Cleaned up dev code