multibuild added and old version stuff removed