Revert "* Partially completed "

This reverts commit f175efd91ce5d46455ed8b678c51661e1f32b56f.