skeleton analyser - cleanup