clean some stuff

Tests: