Yeah, I was disappointed that they brought back the whole "omg I'm a fraud and they're gonna catch me" shit again earlier this season, and it sucks that he's back to being a lawyer so soon. I was hoping that they'd find a way to keep him out of the law firm for the rest of the series.