Add installer
Cleanup