Remove unused stuff after refactor