Remove some newly added data collection, since it bloated the logic of the class