Removed superfluous modules
Updated Feature Extraction