Remove redundant require statements
Remove dead code