1. Fixed bug EBP-YRE-USRD
2. Fixed bug 8AY-RH3-SB4X
3. Remove some old code from SMJ