Remove redundant include
remove some duplication & redundancies