Revert "#8 preparation"

This reverts commit f8f5357d485455fc3e87b4fe11d57bd81820f609.