Clean stuff around.

Tests: