Small changes. Remove unused parameters