Review Request 243: remove obsolete imports