Clean up lint warnings
Version 1.4.2.2