Eliminating Lint errors

Though may not ensure backward compatibility