Clean up, remove deprecated lines