offline build proof and some cleanup