Added better cleanup alias
Merged
Fix conflicts