de cruft and re tune