Reorganize imports and remove commented out code

Signed-off-by: Thanh Ha <thanh.ha@alumni.carleton.ca>