cleanup of data component refactoring