Fix warnings due to unused imports