Remove nonfiring code (which would have caused unexpected behaviour)