More cleaning

Unit tests still green :)