* removed Modix
* cleanups