Config updates, Spring Cleaning
More spring Cleaning