Refactor: remove unused stuff.