removing functionality that has is not part of the requirements and adding some comment block.