clean imports
fixed compilation error in 1.6 due to Incorrect inconvertible error