Still removing cruft