Got rid of stuff that should not have been added...