See #2, Add some extra notes on cleaning up