Remove test code (more)