Cleaner

Needs more testing yet, but most of it...