Okay this is just commin' out of no where. But could it be possible that RJ is still alive and kills Van Pelt and Rigsby, because he gets mad for the CBI thinkin' him dead. 

Van Pelt and RIgsby are also already meant to leave the show after season 6.
Could this be a possibility?