Reduce intrusive code dependencies