removed deprecated feautres & code cleanup