[FIX] pyOpenMS fixes
[CLI] cleanup, simplify CLI