Tony: remove development code.