Cleanup unnecessary imports