Remove unused files and update for cauldron run
Update sources and supervisor
Fix for Xmmx