Remove test code from the final versions