Trying to clean up installation a bit