whitespace cleanup
remove global to track CS support, and enforce loading all keys