cleaned up deprecated methods