fix(controller): cleanup