clean-up! Seems to have fixed 'wrong version building problem'...