Removed comments and unused params.