Removed some unnecessary test code