Formspec cleanup