Removed error stuff