Remove duplicative code