Removed unneeded module
Scopes: Improved parameter check