moved some variables into ucon config & more cleanup. deleted unused files