Resolve warnings
drop commented out unused import line
lens 4 compatibility