Cleans up monkey initialization
Merge pull request #7120 from mwerezak/init

Cleans up monkey initialization