cleanup
revert install_40 changes introduced by some rebase