FIX: Cleanup API class