Deprecated methods deleted. refactoring