Some cleanup

cleanup