Prepare for built in mana-toolkit package
Cleanup