Some code clean up, no change in working system