Got rid of some unnded stuff