Removing dead code
Fix module early termination
The Great Un-`self`-ing