Merge "Remove unnecessary __init__()"