Issue #125 - require_once cleanup