[#363] Remove unused imports, set some variables to final