Refactor: remove unused stuff