Getting rid of 32 stuff