Make mac now cleans up after itself
Fix #460