Remove no longer used code