Config Clean up