[src] removing more unused code, adding some simple comments