Revert "Update controller and service"

This reverts commit 1a9cc5e6c2d9f4e71fd797995c150f744022ef6c.