yep, you should remove it + comments