Clean up public interface.