Cleaned up the APIs and delegates