Remove more require_once()s