Again a cleanup :)

Huge cleanup of te manifest.