Remove more single isntance classes. This one again isn't really necessarily required but good to do.