remove older hacks for common env