aitap more minor cleanup