Cleanup

General cleanup.