Remove un-needed "this" and Class references.