Remove more error-causing logic