Revert some method killing due to increase in method complexity