Beginning some cleanup.