More cleanup. Remove unnecessary parameters.