Removed some stuff from lexical that is now in expressions