minor refactor
remove deprecated methods