Removing unused class imports