Removed unused code
Removed unused code
Removed unused parameters