Documentation fix
Removed unused dependencies
Fixed constants extractor to support missed cases