Removed interrupt wrappers.