JOHNE - Reduce the number of build targets from 4 down to 3