Cleanup of settings framework code