Removes unecessary type casts.
Updating demo.