removed ununused code