Remove useless assignment
Update comments according to latest changes