Remove more dead code
Fix the parameters spec