Minor bug + unnecessary imports