Remove any sort of Raptor interconnection -- should have been in some sort of separate plugin anyhow