minor changes
Removed unused funcionality

Removed some unused funcunality