cleanup for cyrus