The rehab system won't be coming back, because people didn't like it :P
The dungeon will be returning eventually, but I need to think of a proper reason for it to exist. It's a bit redundant to have a "discipline training" area when you can literally adjust people's minds at will, haha.