[FIX] remove unused parameters.
[FIX] small edits.