Preparation for code review - deleted unused file and added a couple of comments.