extra removefromtable function and consistency changes