Remove any trace of soft float & a couple lost one's return