Maybe if we remove those functions..