Remove some cruft, switch to relative require