Remove redundant includes and refactor

Authored by shubham on Jun 10 2019, 5:37 PM.