removed things that should not be there