remove irrelevant  reference
lint error cleanup and todo