removed things that was in the wrong place.