PR for code review

please remove unused methods/variables po :bow: