Removed test code from a3a464b