data/ not used anymore, remove check