Support for mdpi
Cleaning up