Removing test code, clean version