b3.5 & cleanup