Updated dictionary and removed some routines which where obsolete.