Cleanup code no callback changes required.

Clean up code, no callback changes required