use clickstack framework 1.0.3 + cleanup