Fixing typo on code actually not executed (since J! doesn't provide the necessary interface yet)
Removing TODOs that didn't make any sense