remove old comment

Change-Id: Ibf4fad9879c90a62f258c7bce13ba1ba671d13e9
remove comments why a file gets included

also remove some commented out code

Change-Id: Ia80c5c57d8d2a74418032de50eee95642cc0969d