core: cleanup (test commit 2)