Removing un-used imports (code clean up)