Pass model to PMT Analysis for future use
Refactor: remove unused stuff