Cleanup

Some cleaning up.