remove redundant code
remove redundant "CONTEXT" concept
Remove more redundant code
s => self