Little cleaning and disabling crt-off until we fix it