Fixing small errors. Removing unused params.