Some clean
Some cleanup.