Removed custom controller