Refactored API classes, removed unused params