Get rid of silly 'optimization'