massive cleanup of Create proposals