Remove redundant import and comments