Removed some unnecessary testing code