CRAFTERCMS-123 - Code refactoring & clean-up for load testing
CRAFTERCMS-123 - Refactoring