Final cleanup on my end