Created transition delegate

Created a delegate class to handle transition delegate methods
Bug fixes and cleanup

Removed the transition delegate as it was not needed. Other bug fixes
and code cleanup.