Clean up of development code