Fixed imports to make compiler happier, removed an unused method