Code cleanup

* Dropped unused and deprecated models
* Added comments to aliases