purified. Distilled. Good code.

Removed experimental changes. (Only editing the master because I
remember. This is a good starting place. This is the beginning.)