Removed check in general controller