Plug jremove

Change-Id: Icd0a71d4898595ac53be4a17ef7e77ead098728b
Remove some old comments and dead code

Change-Id: I2019a8cea48c11558d7809ba82a2ad19b64bc993