Cleaning config for better re-use