AB Class Cleanup