Some cleanup before Beta release