small fixes and leftover deletes.