Cleaning up unused imports

Signed-off-by: Olivier Van Laere <vanlaere@yahoo-inc.com>