Engine public interface cleanup