Fix: unnecessary return value
Fix: removed unused parameters