#1485 Remove dictionary