Remove some expensive code