Refactor / remove deprecated methods