Finished catkinization, removed duplicate nodes and nodelets