Killed eval for now
Resolve an unnecessary pattern match warning
Unused import