Remove unnecessary class imports