- code/tests cleanup