Adapted setup script and commented out expensive unused information
Solved merge problem