Cleaned up development code.