Remove redundant data structure