Issue #177 - Remove redundant imports