remove_data moved to a commons package