refactored and removed deprecated methods