Remove/update comments