Changed define from hash rocket to arrow
Removed integer. Cleanup up unused scanner functions.