Refactor
Remove unused functions