removed definitions of removed jsps and added new defs