Remove Cruft and rework