Remove unneeded code...
Add abort! close #39