Remove output to screen that were used for debugging
Include static build option (originally by Roland)