first cleanup for collaboration