Clean code.
Clean code.

* Todo : more progn to remove.
Prepare for automatic system assembly.