More preparatory cleanup