table.rs: cleanup