remove now unnecessary functions