WIP de-static