Improves cleanup