I guess this can be removed now?