Removed some components no longer required, and added global interruptible.