Small refactor, remove unused things