nuking cruft and bug