Removed old global indices, added collision solver subsystem