Remove code e.g.s to try and get a running build