Remove data object dependence