Yeah this can be removed now.