Cleanup: remove unused references + a little renaming