Remove test code (n/w)