Removing invoke, cleaning code.