Better match project style
Remove redundant cleanup code