removing use_ltc, refacto includes and minor fixes