removed some error testing bits