quick fix to remove ancient code