Code tidy up - remove a few unneeded imports