Feature/disable deprecated data methods