HV-439

* Removed superfluous type-variables
* Removed some unchecked casts as well as other warnings