Merge "Remove unnecessary __init__ and resource_setup/cleanup"