removed obsolated class
added TODO for performance bug