Cleaning up bootstrap script