further cleanup to batman-adv build