More cleaning.
Further fixes.