removed config, cleaned a bit