Remove unreachable code
Fix import paths