Removed duplicate config as well as commented configs not needed anymore.