code clearing, removed deprecated issues