*Comment Rest V2 Controller code cleanup