Final changes and cleanup.