Better cleanup
New build options