Clean controllers

Clean controllers