Revert "Final touches"

This reverts commit 8572e96191042f3426b40e03d298e85ff9fe362d.