Did some cleanup on the AgeingComponent