Finish cleanup 32 bit and early detect build type