More work on requires
Remove hack that is no longer needed
Remove require