Revert "Finishing touches"

This reverts commit bb57aece825357f875f1c85b41d1660a7069373b.