Revert "Just some final touches for now"

This reverts commit 9839b76abd57f232a2a5d51826438bd583a6c855.