small fixes, deletes