Removed futile imports / code