cleanup

Some cleanup.