zafira integration code cleanup