Revert "final ready for finishing touches"

This reverts commit 789f4ca78540811e7fb0df9c1d3f103363361a8b.