7 Years Ago
Component cleanup