Merge "Move removeClient to ClientController" into main