Changed configuration parsing code and removed old functions