Remove redundant occurrences of "this" in main class