Simplify and remove things we don't need