Yeah, I have a feeling that's pretty excatly where it's going. Since season 6 is suppose to be more like the beginning, if they got rid of Lucifer entirely, and everything was good...they wouldn't have much to fight.