Remove a comment + others fix