Properly removed cruft