Clean up new API