Removing unnecessary class inclusion