Removing raptor references