Cleanup: Minor comments adjustments
Cleanup: Remove unused parameters