[CLEANUP] Controller, Validator, Service