Not related to this but i noticed here.
It is not relevant on 2.1++ so please remove that code while you work on this.