Removed controller/Constants