CLean up and created empty new controlers