Remove //de specific code, and optimize.