Fixes: #2744 Cleaned OPSI plugin code