removed things that should have been removed earlier