Removed some old Infrastructure code.