additional cleanup in xlcs