Removed things that should have been excluded