Installers are not needed
Code cleanup