Fix some lint warnings and clean up unused items