bcongdon misc cleanup