Removed unused setup method
Added support for onComplete event handler