Cleaning

* Removes unnecessary ScopedTypeVariables
* Misc cleaning