Removed the shorthand test.
Removed the use of callback functions.
Removed the callback handler prototype.