Remove unused lines
Fix the shims after changing require context