No changes needed for callback, clean up code.