Removed gadget code, resides in CSA now.