Merge "Remove cleanup code according to TODO comment"