Some useless includes were removed