Can we remove this for good?