Apache class cleanup