Only few cleanup code changes in gear classes