Remove some overhead