remove unused methods
fix mapping issue resolve #515