Removes more configuration remnants.
Removed unused code.