Removed a few config which were accidentally added by cherry-picking from croniccorey