uncommenting content of complex split, removing redundant content
remove unnecessary usage of fusion, fix a couple of includes