Reorganisation and cruft removal