Cleanup and fixed a MAJOR MAJOR MAJOR bug in Configuration Properties