Added some post-install cleanup