Removed test code from mainline