Simplify pre-actions by moving most of the logic out into separate files
Comment out debugging in pre-actions