Hopefully completely fixed number removal