removed some unnecessary tie-ins